do not depend on .env.example any more
Andrew Cantino
2 geänderte Dateien mit 9 neuen Zeilen und 36 gelöschten Zeilen
+ 8
- 27
.openshift/action_hooks/deploy
@@ -8,35 +8,16 @@ echo "-> Deploy step" |
||
| 8 | 8 |
|
| 9 | 9 |
pushd ${OPENSHIFT_REPO_DIR} > /dev/null
|
| 10 | 10 |
|
| 11 |
-if [ -f ${OPENSHIFT_REPO_DIR}/.env.example ]
|
|
| 12 |
-then |
|
| 13 |
- # Default to the environment variable values set in .env.example |
|
| 14 |
-# source ${OPENSHIFT_REPO_DIR}/.env.example
|
|
| 15 |
-# |
|
| 16 |
-# grep = ${OPENSHIFT_REPO_DIR}/.env.example | sed -e 's/^#[^ ]//' | grep -v -e '^#' | cut -d= -f1 | \
|
|
| 17 |
-# while read var ; do |
|
| 18 |
-# eval "echo \"$var=\\\"\${HUGINN_$var:-\$$var}\\\"\""
|
|
| 19 |
-# done | grep -v -e ^= > ${OPENSHIFT_REPO_DIR}/.env
|
|
| 11 |
+echo "DATABASE_NAME=${OPENSHIFT_APP_NAME}" > ${OPENSHIFT_REPO_DIR}/.env
|
|
| 12 |
+echo "DATABASE_USERNAME=${OPENSHIFT_MYSQL_DB_USERNAME}" >> ${OPENSHIFT_REPO_DIR}/.env
|
|
| 13 |
+echo "DATABASE_PASSWORD=${OPENSHIFT_MYSQL_DB_PASSWORD}" >> ${OPENSHIFT_REPO_DIR}/.env
|
|
| 14 |
+echo "DATABASE_HOST=${OPENSHIFT_MYSQL_DB_HOST}" >> ${OPENSHIFT_REPO_DIR}/.env
|
|
| 15 |
+echo "DATABASE_PORT=${OPENSHIFT_MYSQL_DB_PORT}" >> ${OPENSHIFT_REPO_DIR}/.env
|
|
| 16 |
+echo "DATABASE_SOCKET=${OPENSHIFT_MYSQL_DB_SOCKET}" >> ${OPENSHIFT_REPO_DIR}/.env
|
|
| 20 | 17 |
|
| 21 |
- echo "DATABASE_NAME=${OPENSHIFT_APP_NAME}" > ${OPENSHIFT_REPO_DIR}/.env
|
|
| 22 |
- echo "DATABASE_USERNAME=${OPENSHIFT_MYSQL_DB_USERNAME}" >> ${OPENSHIFT_REPO_DIR}/.env
|
|
| 23 |
- echo "DATABASE_PASSWORD=${OPENSHIFT_MYSQL_DB_PASSWORD}" >> ${OPENSHIFT_REPO_DIR}/.env
|
|
| 24 |
- echo "DATABASE_HOST=${OPENSHIFT_MYSQL_DB_HOST}" >> ${OPENSHIFT_REPO_DIR}/.env
|
|
| 25 |
- echo "DATABASE_PORT=${OPENSHIFT_MYSQL_DB_PORT}" >> ${OPENSHIFT_REPO_DIR}/.env
|
|
| 26 |
- echo "DATABASE_SOCKET=${OPENSHIFT_MYSQL_DB_SOCKET}" >> ${OPENSHIFT_REPO_DIR}/.env
|
|
| 18 |
+chmod ugo+r ${OPENSHIFT_REPO_DIR}/.env
|
|
| 27 | 19 |
|
| 28 |
- chmod ugo+r ${OPENSHIFT_REPO_DIR}/.env
|
|
| 29 |
- |
|
| 30 |
- source ${OPENSHIFT_REPO_DIR}/.env
|
|
| 31 |
-else |
|
| 32 |
- cat <<EOM |
|
| 33 |
-*** |
|
| 34 |
-* |
|
| 35 |
-* WARNING: No .env.example file found. |
|
| 36 |
-* |
|
| 37 |
-*** |
|
| 38 |
-EOM |
|
| 39 |
-fi |
|
| 20 |
+source ${OPENSHIFT_REPO_DIR}/.env
|
|
| 40 | 21 |
|
| 41 | 22 |
gem install bundler |
| 42 | 23 |
echo "Migrating" |
+ 1
- 9
.openshift/action_hooks/pre_start_ruby-2.0
@@ -15,15 +15,7 @@ |
||
| 15 | 15 |
|
| 16 | 16 |
echo "-> Pro start ruby step" |
| 17 | 17 |
|
| 18 |
-if [ -f ${OPENSHIFT_REPO_DIR}/.env.example ]
|
|
| 18 |
+if [ -f ${OPENSHIFT_REPO_DIR}/.env ]
|
|
| 19 | 19 |
then |
| 20 | 20 |
source ${OPENSHIFT_REPO_DIR}/.env
|
| 21 |
-else |
|
| 22 |
- cat <<EOM |
|
| 23 |
-*** |
|
| 24 |
-* |
|
| 25 |
-* WARNING: No .env file found. |
|
| 26 |
-* |
|
| 27 |
-*** |
|
| 28 |
-EOM |
|
| 29 | 21 |
fi |